Avoid adding multiple CSRF tokens to a URL#923
Merged
markt-asf merged 7 commits intoapache:mainfrom Jan 7, 2026
Merged
Conversation
Contributor
Author
|
There is a bug in this code. For the URL |
Contributor
Author
|
It also will incorrectly identify parameters which end with the parameter name (e.g. |
This fixes incorrect matching of parameters whose names *end with* the CSRF token name The code is arguably easier to read
Contributor
Author
|
All fixed with recent commits. Ready for review. |
Contributor
|
Remove the commented out System.outs ;) |
markt-asf
reviewed
Nov 20, 2025
Contributor
Author
Done! |
markt-asf
pushed a commit
that referenced
this pull request
Jan 7, 2026
* Avoid adding multiple CSRF tokens to a URL * Add javadoc * Handle special case where query-string contains a ?
markt-asf
pushed a commit
that referenced
this pull request
Jan 7, 2026
* Avoid adding multiple CSRF tokens to a URL * Add javadoc * Handle special case where query-string contains a ?
markt-asf
pushed a commit
that referenced
this pull request
Jan 7, 2026
* Avoid adding multiple CSRF tokens to a URL * Add javadoc * Handle special case where query-string contains a ?
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The unit tests describe the problem: if a URL already contains a CSRF token and that URL is passed through
HttpServletResponse.encode(Redirect)URL, then the URL will end up with multiple instances of a CSRF token.This patch removes those extra instances should they exist.